I was going to ask for some behat test coverage for this scenario, but I took a look and the current behat tests don't test the front-end at all so I think that would be out of scope for this PR.

I've been thinking this over, as I mentioned in my previous change request I wasn't sure if there were edge cases that this would break. I can't think of any specific scenario where that would happen - I don't think it's likely at all that someone has customisations for this elemental block, rather customisations are likely to be in the userforms itself which this change won't affect.

Thank you for submitting this. It works great.